summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-10-18 09:55:23 +0800
committerjiangzhengwenjz <jiangzhengwenjzw@qq.com>2019-10-18 09:55:23 +0800
commita28bb81ab714da3da457734fcce93879f3d121a9 (patch)
treef5b3f255d91ec31acbae2d408d2c6f92fe4fd643 /data
parent88ad62c3f3ba977146d7f997cf23e612b31d2d69 (diff)
battle_main remaining funcs
Diffstat (limited to 'data')
-rw-r--r--data/battle_scripts_1.s4
-rw-r--r--data/battle_scripts_2.s4
2 files changed, 4 insertions, 4 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 0d389b868..8c049f4e0 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -72,7 +72,7 @@ BattleScript_WildMonFled:: @ 81D891D
BattleScript_PrintCantRunFromTrainer:: @ 81D8924
.incbin "baserom.gba", 0x1D8924, 0x16
-gUnknown_81D893A:: @ 81D893A
+BattleScript_PrintFailedToRunString:: @ 81D893A
.incbin "baserom.gba", 0x1D893A, 0x9
BattleScript_PrintCantEscapeFromBattle:: @ 81D8943
@@ -81,7 +81,7 @@ BattleScript_PrintCantEscapeFromBattle:: @ 81D8943
BattleScript_PrintFullBox:: @ 81D8949
.incbin "baserom.gba", 0x1D8949, 0x4
-gUnknown_81D894D:: @ 81D894D
+BattleScript_ActionSwitch:: @ 81D894D
.incbin "baserom.gba", 0x1D894D, 0xA4
BattleScript_Pausex20:: @ 81D89F1
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 3f8ed8f38..199fd0c78 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -3,10 +3,10 @@
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
gBattlescriptsForSafariActions:: @ 81D9A04