diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 15:39:21 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 16:03:06 -0500 |
| commit | f2763832931127fc24e7cb9f9cdd85e3cf706a5c (patch) | |
| tree | d23050509231d1d9c6d1694b2755c93fdaf26a4e /asm/link_rfu_3.s | |
| parent | aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (diff) | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
Merge master into sync-script
Diffstat (limited to 'asm/link_rfu_3.s')
| -rw-r--r-- | asm/link_rfu_3.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index ef64c08dd..1bd5420fa 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -10493,7 +10493,7 @@ _0811AFF8: _0811AFFA: cmp r4, 0x3 bgt _0811B030 - ldr r0, _0811B044 @ =gUnknown_3007460 + ldr r0, _0811B044 @ =gRfuLinkStatus ldr r0, [r0] lsls r1, r4, 5 adds r0, r1 @@ -10526,7 +10526,7 @@ _0811B030: bl StringCopy b _0811B080 .align 2, 0 -_0811B044: .4byte gUnknown_3007460 +_0811B044: .4byte gRfuLinkStatus _0811B048: .4byte gSpeciesNames _0811B04C: .4byte gUnknown_8457DB8 _0811B050: |