summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-11-06 11:30:21 -0600
committerDiegoisawesome <diego@domoreaweso.me>2018-11-06 11:30:21 -0600
commitf8d337e491f531285f6067e2e7f39a8d606036d6 (patch)
tree4e01743813177b9c69bc0e1108a22cc44e6da6c0 /asm
parent6d38431c330a79d97bfb72fdaaaa65901ce0fa64 (diff)
Finish cleaning up text.c
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_frontier_1.s2
-rw-r--r--asm/contest.s2
-rw-r--r--asm/party_menu.s2
-rw-r--r--asm/pokenav.s4
4 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s
index 7ebc2f256..78321e09c 100644
--- a/asm/battle_frontier_1.s
+++ b/asm/battle_frontier_1.s
@@ -1180,7 +1180,7 @@ sub_81965D8: @ 81965D8
negs r0, r0
ands r0, r1
strb r0, [r2]
- bl GetPlayerTextSpeed
+ bl GetPlayerTextSpeedDelay
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
diff --git a/asm/contest.s b/asm/contest.s
index b984a98b6..35dbaf385 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -6485,7 +6485,7 @@ _080DEC80:
b _080DEC9C
.pool
_080DEC94:
- bl GetPlayerTextSpeed
+ bl GetPlayerTextSpeedDelay
lsls r0, 24
lsrs r1, r0, 24
_080DEC9C:
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 53a66378c..6c2affb26 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -6178,7 +6178,7 @@ sub_81B3300: @ 81B3300
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
- bl GetPlayerTextSpeed
+ bl GetPlayerTextSpeedDelay
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 732f0ef2e..6fedbbd58 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -10440,7 +10440,7 @@ sub_81CC158: @ 81CC158
adds r1, 0xF
bl sub_81CAF78
adds r5, r0, 0
- bl GetPlayerTextSpeed
+ bl GetPlayerTextSpeedDelay
lsls r0, 24
lsrs r0, 24
ldrb r2, [r4, 0x14]
@@ -22957,7 +22957,7 @@ sub_81D2BF4: @ 81D2BF4
movs r1, 0x1
orrs r0, r1
strb r0, [r2]
- bl GetPlayerTextSpeed
+ bl GetPlayerTextSpeedDelay
adds r3, r0, 0
lsls r3, 24
lsrs r3, 24