summaryrefslogtreecommitdiff
path: root/arm9/asm/CARD_request.s
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-05-20 18:07:01 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-05-20 18:07:01 -0400
commit9c162d2ab15ab779d25a910d2e552e5fad314f32 (patch)
tree9ede41d70428e4ae1c1bd717ac2ecf60bc14cc9c /arm9/asm/CARD_request.s
parentdace495d47de9479f031f34f948151595acbca13 (diff)
No more hardcoded data symbols (static)
Diffstat (limited to 'arm9/asm/CARD_request.s')
-rw-r--r--arm9/asm/CARD_request.s10
1 files changed, 6 insertions, 4 deletions
diff --git a/arm9/asm/CARD_request.s b/arm9/asm/CARD_request.s
index bb9c32a9..a6793d89 100644
--- a/arm9/asm/CARD_request.s
+++ b/arm9/asm/CARD_request.s
@@ -1,6 +1,8 @@
.include "asm/macros.inc"
.include "global.inc"
+ .extern cardi_common
+
.text
arm_func_start CARDi_Request
@@ -111,7 +113,7 @@ _020D7B08:
CARDi_TaskThread: ; 0x020D7B20
stmdb sp!, {r4-r7,lr}
sub sp, sp, #0x4
- ldr r5, _020D7B78 ; =0x021D55C0
+ ldr r5, _020D7B78 ; =cardi_common
mov r6, #0x0
add r7, r5, #0x44
_020D7B34:
@@ -135,7 +137,7 @@ _020D7B60:
blx r1
b _020D7B34
.balign 4
-_020D7B78: .word 0x021D55C0
+_020D7B78: .word cardi_common
arm_func_start CARDi_OnFifoRecv
CARDi_OnFifoRecv: ; 0x020D7B7C
@@ -149,7 +151,7 @@ CARDi_OnFifoRecv: ; 0x020D7B7C
addeq sp, sp, #0x4
ldmeqia sp!, {lr}
bxeq lr
- ldr r1, _020D7BC8 ; =0x021D55C0
+ ldr r1, _020D7BC8 ; =cardi_common
ldr r0, [r1, #0x114]
bic r0, r0, #0x20
str r0, [r1, #0x114]
@@ -159,4 +161,4 @@ CARDi_OnFifoRecv: ; 0x020D7B7C
ldmia sp!, {lr}
bx lr
.balign 4
-_020D7BC8: .word 0x021D55C0
+_020D7BC8: .word cardi_common