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 /src/quest_log.c | |
| parent | aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (diff) | |
| parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) | |
Merge master into sync-script
Diffstat (limited to 'src/quest_log.c')
| -rw-r--r-- | src/quest_log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quest_log.c b/src/quest_log.c index 970071a0f..4d94c78ad 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -3119,7 +3119,7 @@ static const u16 *sub_8113FBC(const u16 *a0) StringCopy(gStringVar1, ItemId_GetName(r5[0])); if (r5[0] == ITEM_ESCAPE_ROPE) { - GetMapNameGeneric(gStringVar2, r5[2]); + GetMapNameGeneric(gStringVar2, (u8)r5[2]); StringExpandPlaceholders(gStringVar4, gUnknown_841AFA6); } else if (r5[1] != 0xFFFF) @@ -4373,7 +4373,7 @@ static u16 *sub_81157DC(u16 *a0, const u16 *a1) static const u16 *sub_8115800(const u16 *a0) { const u16 *r4 = sub_8113E88(42, a0); - GetMapNameGeneric(gStringVar1, r4[0]); + GetMapNameGeneric(gStringVar1, (u8)r4[0]); StringExpandPlaceholders(gStringVar4, gUnknown_841B064); return r4 + 1; } |