From 8ff6027f97e11ce05904267cbb79306474287923 Mon Sep 17 00:00:00 2001
From: Catobat <69204835+Catobat@users.noreply.github.com>
Date: Fri, 5 May 2023 23:45:29 +0200
Subject: [PATCH] Name some functions for marking a Fuser as done

---
 data/scripts/npc/script_Farmer.inc         | 3 ++-
 data/scripts/npc/script_MysteriousWall.inc | 2 +-
 include/npc.h                              | 2 +-
 src/npc/farmers.c                          | 8 ++++----
 src/npcUtils.c                             | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/data/scripts/npc/script_Farmer.inc b/data/scripts/npc/script_Farmer.inc
index 51eaf67e..11f0566f 100644
--- a/data/scripts/npc/script_Farmer.inc
+++ b/data/scripts/npc/script_Farmer.inc
@@ -30,9 +30,10 @@ script_0800B134:
 	Call sub_0807F650
 	_0807E9F0
 .ifndef EU
+	@! @bug: In EU, Eenie is marked as done fusing if kinstone menu is closed without fusing
 	JumpIfNot script_0800B160
 .endif
-	Call sub_0806BCC0
+	Call Farmers_MarkEenieFuserDoner
 script_0800B160:
 	Call EnablePauseMenu
 	EnablePlayerControl
diff --git a/data/scripts/npc/script_MysteriousWall.inc b/data/scripts/npc/script_MysteriousWall.inc
index d0bc0a83..28ab2c5e 100644
--- a/data/scripts/npc/script_MysteriousWall.inc
+++ b/data/scripts/npc/script_MysteriousWall.inc
@@ -16,7 +16,7 @@ script_0800B98A:
 	EnablePlayerControl
 	Jump script_0800B98A
 script_0800B99E:
-	Call sub_0806F188
+	Call MarkFuserDone
 	Call EnablePauseMenu
 	EnablePlayerControl
 script_0800B9AC:
diff --git a/include/npc.h b/include/npc.h
index dff0378c..6b9e5cb5 100644
--- a/include/npc.h
+++ b/include/npc.h
@@ -74,7 +74,7 @@ void sub_0806EE04(Entity* ent, void* a2, u32 a3);
 u32 sub_0806EE20(Entity* ent);
 s32 sub_0806F078(Entity* ent, s32 a2);
 void sub_0806F118(Entity* ent);
-void sub_0806F188(Entity* ent);
+void MarkFuserDone(Entity* ent);
 void ShowNPCDialogue(Entity* ent, const Dialog* dia);
 
 Entity* CreateNPC(u32 subtype, u32 form, u32 parameter);
diff --git a/src/npc/farmers.c b/src/npc/farmers.c
index d3ccf5fd..d2c4e2fc 100644
--- a/src/npc/farmers.c
+++ b/src/npc/farmers.c
@@ -53,9 +53,9 @@ void sub_0806BCB8(Entity* this) {
     this->animationState = this->timer;
 }
 
-void sub_0806BCC0(Entity* this) {
+void Farmers_MarkEenieFuserDoner(Entity* this) {
     if (this->type == 0) {
-        sub_0806F188(this);
+        MarkFuserDone(this);
     }
 }
 
@@ -69,12 +69,12 @@ void sub_0806BCE8(Entity* this) {
           DIALOG_KINSTONE,
           DIALOG_CHECK_FLAG,
           1,
-          { TEXT_INDEX(TEXT_FARMERS, 0X7), TEXT_INDEX(TEXT_FARMERS, 0x2) } },
+          { TEXT_INDEX(TEXT_FARMERS, 0x7), TEXT_INDEX(TEXT_FARMERS, 0x2) } },
         { 0x29,
           DIALOG_KINSTONE,
           DIALOG_CHECK_FLAG,
           1,
-          { TEXT_INDEX(TEXT_FARMERS, 0X11), TEXT_INDEX(TEXT_FARMERS, 0xd) } },
+          { TEXT_INDEX(TEXT_FARMERS, 0x11), TEXT_INDEX(TEXT_FARMERS, 0xd) } },
     };
     ShowNPCDialogue(this, &gUnk_08113158[this->type]);
 }
diff --git a/src/npcUtils.c b/src/npcUtils.c
index b5963d94..8702f3eb 100644
--- a/src/npcUtils.c
+++ b/src/npcUtils.c
@@ -352,7 +352,7 @@ u32 UpdateFuseInteraction(Entity* ent) {
     return ret;
 }
 
-void sub_0806F188(Entity* ent) {
+void MarkFuserDone(Entity* ent) {
     u32 idx = GetFuserId(ent);
     if (idx != 0)
         gSave.fuserOffers[idx] = KINSTONE_FUSER_DONE;