From c88f5cf280c290da3f33a280011fc200ae86dbcf Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Sun, 8 Jan 2023 17:47:29 +0100
Subject: [PATCH] Names in KinstoneWorldEvent struct

---
 include/kinstone.h                | 10 +++++-----
 src/menu/kinstoneMenu.c           |  8 ++++----
 src/menu/pauseMenuScreen6.c       |  2 +-
 src/object/cameraTarget.c         |  2 +-
 src/subtask/subtaskLocalMapHint.c |  2 +-
 src/subtask/subtaskWorldEvent.c   |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/kinstone.h b/include/kinstone.h
index 0b889f13..a5c20d44 100644
--- a/include/kinstone.h
+++ b/include/kinstone.h
@@ -23,13 +23,13 @@ extern FuseInfo gFuseInfo;
 
 typedef struct {
     u8 objPalette;
-    u8 unk1;
-    u8 unk2;
+    u8 gfxOffsetPiece;
+    u8 gfxOffsetFull;
     u8 subtask; // SUBTASK_WORLDEVENT or 0
     u8 worldEventId;
-    u8 unk5;
-    u8 unk6;
-    u8 unk7; // TODO flag if it shows a map hint?
+    u8 shape;
+    u8 bubbleIcon;
+    u8 mapMarkerIcon; // 0 for no map marker
 } KinstoneWorldEvent;
 // Indexed by kinstoneId
 extern const KinstoneWorldEvent gKinstoneWorldEvents[];
diff --git a/src/menu/kinstoneMenu.c b/src/menu/kinstoneMenu.c
index d81e9573..62621f7e 100644
--- a/src/menu/kinstoneMenu.c
+++ b/src/menu/kinstoneMenu.c
@@ -265,8 +265,8 @@ void KinstoneMenu_Type3_Overlay0(void) {
 }
 
 void KinstoneMenu_Type3_Overlay1(void) {
-    u32 temp = gKinstoneWorldEvents[gKinstoneMenu.unk2a].unk5;
-    if (temp != gKinstoneWorldEvents[gFuseInfo.kinstoneId].unk5) {
+    u32 temp = gKinstoneWorldEvents[gKinstoneMenu.unk2a].shape;
+    if (temp != gKinstoneWorldEvents[gFuseInfo.kinstoneId].shape) {
         SoundReq(SFX_ITEM_SHIELD_BOUNCE);
         SetMenuType(4);
     } else {
@@ -517,9 +517,9 @@ void sub_080A42E0(u32 kinstoneId, u32 param_2) {
     const KinstoneWorldEvent* ptr = &gKinstoneWorldEvents[kinstoneId];
 
     if (param_2 == 0xff) {
-        uVar1 = ptr->unk2;
+        uVar1 = ptr->gfxOffsetFull;
     } else {
-        uVar1 = ptr->unk1;
+        uVar1 = ptr->gfxOffsetPiece;
     }
     iVar4 = sub_080A43A8(uVar1);
     if ((param_2 != 0) && (param_2 != 0xff)) {
diff --git a/src/menu/pauseMenuScreen6.c b/src/menu/pauseMenuScreen6.c
index a7fa969c..c9a085c9 100644
--- a/src/menu/pauseMenuScreen6.c
+++ b/src/menu/pauseMenuScreen6.c
@@ -206,7 +206,7 @@ void sub_080A68D4(void) {
 
     for (i = 10; i <= 100; i++) {
         if (CheckKinstoneFused(i) && !CheckFusionMapMarkerDisabled(i)) {
-            uVar4 = gKinstoneWorldEvents[i].unk7;
+            uVar4 = gKinstoneWorldEvents[i].mapMarkerIcon;
             ptr = &gWorldEvents[gKinstoneWorldEvents[i].worldEventId];
             sub_080A698C(ptr->_c, ptr->_e, DRAW_DIRECT_SPRITE_INDEX, uVar4 + 100);
         }
diff --git a/src/object/cameraTarget.c b/src/object/cameraTarget.c
index 79b56190..86321cbb 100644
--- a/src/object/cameraTarget.c
+++ b/src/object/cameraTarget.c
@@ -133,7 +133,7 @@ void CameraTarget_Action2(Entity* this) {
                 bVar2 = this->type2;
             }
             ptr = gKinstoneWorldEvents + bVar2;
-            bVar1 = ptr->unk6;
+            bVar1 = ptr->bubbleIcon;
             bVar3 = bVar1 & 1;
             this->palette.b.b0 = bVar3;
             temp = gUnk_0811F744[bVar1] < 0;
diff --git a/src/subtask/subtaskLocalMapHint.c b/src/subtask/subtaskLocalMapHint.c
index 8f9bb133..7a86d5e4 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 = sub_080A6A80(uVar3, uVar4)->_4;
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 {