diff options
| author | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-10-11 18:56:58 +0200 |
| commit | 50fcc3a1e96a1e35576d2d0769aec251a40805dd (patch) | |
| tree | f100b156dfa1eb6fe773d90004d79bb246e9dcbf /asm/quest_log.s | |
| parent | acdd8cab26671a975b4f155b84b24388df9d84bc (diff) | |
| parent | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/quest_log.s')
| -rw-r--r-- | asm/quest_log.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/quest_log.s b/asm/quest_log.s index 9b7c29ccc..c54193c6f 100644 --- a/asm/quest_log.s +++ b/asm/quest_log.s @@ -7157,12 +7157,12 @@ sub_8113EAC: @ 8113EAC bl GetSpeciesName b _08113F08 _08113ED0: - ldr r1, _08113EDC @ =gUnknown_8415A62 + ldr r1, _08113EDC @ =gText_EggNickname adds r0, r3, 0 bl StringCopy b _08113F08 .align 2, 0 -_08113EDC: .4byte gUnknown_8415A62 +_08113EDC: .4byte gText_EggNickname _08113EE0: movs r0, 0xCE lsls r0, 1 @@ -7171,15 +7171,15 @@ _08113EE0: movs r0, 0xB adds r1, r4, 0 muls r1, r0 - ldr r0, _08113EFC @ =gUnknown_8245EE0 + ldr r0, _08113EFC @ =gSpeciesNames adds r1, r0 adds r0, r2, 0 bl UnkTextUtil_SetPtrI b _08113F08 .align 2, 0 -_08113EFC: .4byte gUnknown_8245EE0 +_08113EFC: .4byte gSpeciesNames _08113F00: - ldr r1, _08113F10 @ =gUnknown_8415A62 + ldr r1, _08113F10 @ =gText_EggNickname adds r0, r5, 0 bl UnkTextUtil_SetPtrI _08113F08: @@ -7187,7 +7187,7 @@ _08113F08: pop {r0} bx r0 .align 2, 0 -_08113F10: .4byte gUnknown_8415A62 +_08113F10: .4byte gText_EggNickname thumb_func_end sub_8113EAC thumb_func_start sub_8113F14 |