diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-10-11 11:56:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-11 11:56:24 -0500 |
| commit | bd88c803793a6e5c8f5d2ac1a852c912e980ef1d (patch) | |
| tree | d45390654cd3f80ffccd4af95760133ef77366bd /asm/quest_log.s | |
| parent | 10fff9c6f2d29899952d1751d3de827e7e98bb60 (diff) | |
| parent | 05d03f7f3256b143a01506421c19964bcceaea5c (diff) | |
Merge pull request #18 from ProjectRevoTPP/pokemon
almost finish decompiling pokemon.c
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 |