diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-15 09:19:30 -0500 |
| commit | f07f73e188f0ff81f313e74230d5ad055461966f (patch) | |
| tree | a6b628ac95872fbf8fedbd38b9024cb1e41a55ba /asm/link_rfu_3.s | |
| parent | f12a82b068bb5871bc8ee9fd4146baa89799e645 (diff) | |
| parent | a2e49c4d5c275b28b6485d404e305a98c935d022 (diff) | |
Merge branch 'master' into quest_log
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 a66dc0980..d3c5d5917 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -10960,7 +10960,7 @@ sub_811B31C: @ 811B31C lsrs r0, 16 movs r1, 0xD muls r1, r0 - ldr r0, _0811B4B4 @ =gUnknown_823E558 + ldr r0, _0811B4B4 @ =gTrainerClassNames adds r1, r0 adds r0, r6, 0 bl StringCopy @@ -11109,7 +11109,7 @@ _0811B45E: b _0811B4F0 .align 2, 0 _0811B4B0: .4byte gUnknown_2039624 -_0811B4B4: .4byte gUnknown_823E558 +_0811B4B4: .4byte gTrainerClassNames _0811B4B8: .4byte gUnknown_84594B0 _0811B4BC: .4byte gUnknown_84594C4 _0811B4C0: .4byte gStringVar4 |