diff options
| author | octorock <79596758+octorock@users.noreply.github.com> | 2023-05-31 23:51:20 +0200 |
|---|---|---|
| committer | octorock <79596758+octorock@users.noreply.github.com> | 2023-05-31 23:51:20 +0200 |
| commit | bbac5ace3fb87828f288ff583f72a5a51af5a05f (patch) | |
| tree | 70fb8b55e62a1d270e9f3cec927519a34ca17100 /src/subtask | |
| parent | 134f39a0bdad19fc794e19fba56d072d1ab30022 (diff) | |
| parent | 79bbd540a8846e48f97b77ea03d28828bdcca0ae (diff) | |
Merge remote-tracking branch 'upstream/master' into tilemap-docs
Diffstat (limited to 'src/subtask')
| -rw-r--r-- | src/subtask/subtaskLocalMapHint.c | 2 | ||||
| -rw-r--r-- | src/subtask/subtaskWorldEvent.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/subtask/subtaskLocalMapHint.c b/src/subtask/subtaskLocalMapHint.c index 22758da4..357e3f7e 100644 --- a/src/subtask/subtaskLocalMapHint.c +++ b/src/subtask/subtaskLocalMapHint.c @@ -38,7 +38,7 @@ void sub_080A6B04(void) { sub_080A4DB8(6); ptr = &gKinstoneWorldEvents[gFuseInfo.kinstoneId]; ptr2 = &gWorldEvents[ptr->worldEventId]; - bVar1 = ptr->unk7; + bVar1 = ptr->mapMarkerIcon; uVar3 = ptr2->_c; uVar4 = ptr2->_e; uVar2 = GetOverworldLocation(uVar3, uVar4)->windcrestId; diff --git a/src/subtask/subtaskWorldEvent.c b/src/subtask/subtaskWorldEvent.c index bae3e921..0c7c5b5b 100644 --- a/src/subtask/subtaskWorldEvent.c +++ b/src/subtask/subtaskWorldEvent.c @@ -58,7 +58,7 @@ void Subtask_WorldEvent_Update(void) { void Subtask_WorldEvent_End(void) { MessageInitialize(); sub_0806F38C(); - if (gKinstoneWorldEvents[gFuseInfo.kinstoneId].unk7 != 0) { + if (gKinstoneWorldEvents[gFuseInfo.kinstoneId].mapMarkerIcon != 0) { // Show the map hint. MenuFadeIn(SUBTASK_LOCALMAPHINT, gUI.field_0x3); } else { |