summaryrefslogtreecommitdiff
path: root/asm/battle_controller_safari.s
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-09-07 16:35:25 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-09-07 16:35:25 +0200
commit8bfdc42d0ee8d0eae7108fd4c68accfd4649f3a0 (patch)
tree1a4b52307b63ecec8aa0bac34d9a86b29a8f1576 /asm/battle_controller_safari.s
parentd7d1b97bb82daca99995a3f0a7986720ae7d6237 (diff)
name b message functions, split battle2
Diffstat (limited to 'asm/battle_controller_safari.s')
-rw-r--r--asm/battle_controller_safari.s6
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_controller_safari.s b/asm/battle_controller_safari.s
index be274e81b..d7fd0b505 100644
--- a/asm/battle_controller_safari.s
+++ b/asm/battle_controller_safari.s
@@ -790,7 +790,7 @@ dp01t_10_6_message: @ 81599DC
adds r0, r1
ldrh r0, [r0]
bl BufferStringBattle
- ldr r0, =gUnknown_02022E2C
+ ldr r0, =gDisplayedStringBattle
movs r1, 0
bl battle_show_message_maybe
ldr r1, =gBattleBankFunc
@@ -879,8 +879,8 @@ _08159AAE:
movs r1, 0
bl sub_8059CB4
ldr r0, =gUnknown_085CCA04
- bl get_battle_strings_
- ldr r0, =gUnknown_02022E2C
+ bl StrCpyDecodeToDisplayedStringBattle
+ ldr r0, =gDisplayedStringBattle
movs r1, 0x1
bl battle_show_message_maybe
pop {r4}