summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-10-31 22:13:33 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2019-10-31 22:13:33 -0400
commit930c7c4ad7f698b76b8ae45e13e7e9baa3fc1ee6 (patch)
tree7411f86c3d7ac2fbc7d6b4b36e653bc4311202bb /asm
parent193c12d401ac5b1016d77e60c36e8d9960af9d82 (diff)
Dump berries and do major splittage
Diffstat (limited to 'asm')
-rw-r--r--asm/berry_crush_3.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s
index 51657f296..fa7e038cb 100644
--- a/asm/berry_crush_3.s
+++ b/asm/berry_crush_3.s
@@ -1537,7 +1537,7 @@ _0814E21A:
lsls r1, r2, 3
subs r1, r2
lsls r1, 2
- ldr r0, _0814E294 @ =sBerries
+ ldr r0, _0814E294 @ =gBerries
adds r1, r0
ldr r0, _0814E298 @ =gStringVar1
bl StringCopy
@@ -1591,7 +1591,7 @@ _0814E27E:
bl StringCopy
b _0814E2B8
.align 2, 0
-_0814E294: .4byte sBerries
+_0814E294: .4byte gBerries
_0814E298: .4byte gStringVar1
_0814E29C: .4byte gUnknown_846F4B8
_0814E2A0: .4byte gStringVar4