Merge remote-tracking branch 'upstream/master' into tilemap-docs

This commit is contained in:
octorock
2023-05-31 23:51:20 +02:00
254 changed files with 4013 additions and 4939 deletions
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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 {