Name more functions

include/kinstone.h

@@ -209,7 +209,7 @@ typedef struct {
     u16 y;        /**< Y position of the actual event. */
     u16 _c;       // see sub_080A6A80, related to _0 and _2 of gUnk_08127F94
     u16 _e;       // see sub_080A6A80, related to _1 and _3 of gUnk_08127F94
-    u8 condition; // TODO some sort of flag determining what type the bank&flag are? see sub_0801E8D4
+    u8 condition; // TODO some sort of flag determining what type the bank&flag are? see UpdateVisibleFusionMapMarkers
     u8 bank;      /**< @see LocalBanks */
     u16 flag;
 } WorldEvent;

include/npc.h

@@ -86,7 +86,7 @@ void CollideFollowers(void);
 // TODO move?
 void sub_08078784(Entity* ent, u32 arg1);
 u32 sub_0806F5A4(u32);
-u32 sub_0801E99C(Entity*);
+u32 GetFusionToOffer(Entity*);
 void sub_08078778(Entity*);
 void sub_0807000C(Entity*);
 void sub_080787A8(Entity*, u32);

src/common.c

@@ -899,8 +899,8 @@ s32 GetIndexInKinstoneBag(u32 kinstoneId) {
     return -1;
 }
 
-// Check conditions, something with kinstones
+// For example if a chest from a fusion is opened, hide the chest marker
-void sub_0801E8D4(void) {
+void UpdateVisibleFusionMapMarkers(void) {
     u32 kinstoneId;
     for (kinstoneId = 10; kinstoneId <= 100; ++kinstoneId) {
         if (CheckKinstoneFused(kinstoneId) && !CheckFusionMapMarkerDisabled(kinstoneId)) {
@@ -969,7 +969,7 @@ void sub_0801E8D4(void) {
 
 extern u8* gUnk_08001DCC[];
 
-u32 sub_0801E99C(Entity* entity) {
+u32 GetFusionToOffer(Entity* entity) {
     u8* fuserData;
     u32 fuserId;
     u32 offeredFusion;

src/enemy/businessScrub.c

@@ -547,7 +547,7 @@ void sub_0802922C(Entity* this) {
 }
 
 void sub_0802925C(Entity* this) {
-    sub_08078784(this, sub_0801E99C(this));
+    sub_08078784(this, GetFusionToOffer(this));
 }
 
 void sub_08029270(Entity* this) {

src/menu/pauseMenu.c

@@ -59,14 +59,14 @@ void Subtask_PauseMenu(void) {
 struct_08127F94* sub_080A6A80(u32, u32);
 
 extern u8 gUnk_02034492[];
-void sub_0801E8D4(void);
+void UpdateVisibleFusionMapMarkers(void);
 s32 sub_080A50A0(s32);
 
 void PauseMenu_Variant0(void) {
     struct_08127F94* ptr;
     int r0, r1;
 
-    sub_0801E8D4();
+    UpdateVisibleFusionMapMarkers();
     sub_080A4D34();
     r1 = 4;
     do {

src/npc/anju.c

@@ -29,7 +29,7 @@ void Anju(Entity* this) {
 }
 
 void sub_0806C354(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/bladeBrothers.c

@@ -291,7 +291,7 @@ void sub_08068ADC(Entity* this) {
 void sub_08068AFC(Entity* this) {
     this->action = 1;
     this->spriteSettings.draw = 1;
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
     sub_0807DD50(this);
 }

src/npc/brocco.c

@@ -115,7 +115,7 @@ void sub_080636D8(Entity* this) {
 }
 
 void sub_080636F4(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/carpenter.c

@@ -92,7 +92,7 @@ void sub_08067304(Entity* this) {
 }
 
 void sub_08067314(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/cat.c

@@ -129,7 +129,7 @@ void sub_080677EC(Entity* this) {
         this->spriteSettings.flipX = 0;
     }
 
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     this->hitbox = (Hitbox*)&gUnk_08110EF0;
     uVar2 = sub_0805ACC0(this);
     if (uVar2 == 0) {

src/npc/cow.c

@@ -50,7 +50,7 @@ void sub_08068FC0(Entity* ent) {
         *(u16*)&ent->field_0x68 = var1;
         ent->field_0x6a.HWORD = r2;
     }
-    ent->field_0x6c.HALF.LO = sub_0801E99C(ent);
+    ent->field_0x6c.HALF.LO = GetFusionToOffer(ent);
 
     InitAnimationForceUpdate(ent, ent->animationState + 4);
 }

src/npc/cucco.c

@@ -15,7 +15,7 @@ void Cucco(Entity* this) {
 
 void Cucco_Init(Entity* this) {
     this->action++;
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_080787A8(this, this->field_0x68.HALF.LO);
     SetDefaultPriority(this, PRIO_MESSAGE);
     this->subAction = 0;

src/npc/cuccoChick.c

@@ -23,7 +23,7 @@ void CuccoChick(Entity* this) {
 
 void CuccoChick_Init(Entity* this) {
     this->action++;
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_080787A8(this, this->field_0x68.HALF.LO);
     SetDefaultPriority(this, PRIO_MESSAGE);
     this->subAction = 0;

src/npc/dampe.c

@@ -34,7 +34,7 @@ void Dampe(Entity* this) {
 }
 
 void sub_0806BE3C(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/din.c

@@ -30,7 +30,7 @@ void Din(Entity* this) {
 }
 
 void sub_08064828(Entity* this) {
-    u32 tmp = sub_0801E99C(this);
+    u32 tmp = GetFusionToOffer(this);
     if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) {
         tmp = 0;
     }

src/npc/dog.c

@@ -206,7 +206,7 @@ void sub_08069B44(Entity* this) {
         this->timer = 30;
         this->animationState = 2;
         this->field_0x6a.HALF.LO = 0xff;
-        this->field_0x74.HALF.LO = sub_0801E99C(this);
+        this->field_0x74.HALF.LO = GetFusionToOffer(this);
         SetDefaultPriority(this, PRIO_MESSAGE);
         InitAnimationForceUpdate(this, 10);
         if ((this->flags & ENT_SCRIPTED) != 0) {

src/npc/epona.c

@@ -27,7 +27,7 @@ void sub_080659B8(Entity* this) {
     this->spriteSettings.draw = 1;
     this->animationState = 6;
     this->field_0x68.HALF.HI = -1;
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     InitAnimationForceUpdate(this, this->animationState / 2);
 }
 

src/npc/farmers.c

@@ -60,7 +60,7 @@ void sub_0806BCC0(Entity* this) {
 }
 
 void sub_0806BCD4(Entity* this) {
-    sub_08078784(this, sub_0801E99C(this));
+    sub_08078784(this, GetFusionToOffer(this));
 }
 
 void sub_0806BCE8(Entity* this) {

src/npc/farore.c

@@ -30,7 +30,7 @@ void Farore(Entity* this) {
 }
 
 void sub_08064A28(Entity* this) {
-    u32 tmp = sub_0801E99C(this);
+    u32 tmp = GetFusionToOffer(this);
     if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) {
         tmp = 0;
     }

src/npc/festari.c

@@ -21,7 +21,7 @@ void sub_0805FE10(Entity* this) {
     this->action = 1;
     this->spriteSettings.draw = TRUE;
     SetDefaultPriority(this, PRIO_MESSAGE);
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
     sub_0807DD50(this);
 }

src/npc/forestMinish.c

@@ -535,7 +535,7 @@ void ForestMinish(Entity* this) {
 }
 
 void sub_08060090(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/gentari.c

@@ -8,7 +8,7 @@ void Gentari(Entity* this) {
             this->action = 1;
             this->spriteSettings.draw = TRUE;
             SetDefaultPriority(this, PRIO_MESSAGE);
-            this->field_0x68.HALF.LO = sub_0801E99C(this);
+            this->field_0x68.HALF.LO = GetFusionToOffer(this);
             sub_08078784(this, this->field_0x68.HALF.LO);
             sub_0807DD50(this);
             break;

src/npc/ghostBrothers.c

@@ -111,7 +111,7 @@ void sub_08065CCC(Entity* this) {
 }
 
 void sub_08065D00(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/gina.c

@@ -9,7 +9,7 @@ void Gina(Entity* this) {
             this->action = 1;
             this->spriteSettings.draw = 1;
 
-            this->field_0x68.HALF.LO = sub_0801E99C(this);
+            this->field_0x68.HALF.LO = GetFusionToOffer(this);
             sub_08078784(this, this->field_0x68.HALF.LO);
             sub_0807DD50(this);
             break;

src/npc/goron.c

@@ -105,7 +105,7 @@ void sub_08069428(Entity* this, s32 offsetX, bool32 createFx65) {
 }
 
 u32 sub_08069480(Entity* this) {
-    return (u8)sub_0801E99C(this);
+    return (u8)GetFusionToOffer(this);
 }
 
 void sub_0806948C(Entity* this, ScriptExecutionContext* context) {

src/npc/gregal.c

@@ -155,7 +155,7 @@ void sub_0806CD4C(Entity* this) {
 }
 
 void sub_0806CD58(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/hurdyGurdyMan.c

@@ -101,7 +101,7 @@ void sub_0806E418(Entity* this) {
 }
 
 void sub_0806E440(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/kid.c

@@ -555,7 +555,7 @@ void sub_08062948(Entity* this, ScriptExecutionContext* context) {
 }
 
 void sub_08062A48(Entity* this, ScriptExecutionContext* context) {
-    this->field_0x6a.HALF.LO = sub_0801E99C(this);
+    this->field_0x6a.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x6a.HALF.LO);
 }
 

src/npc/kingDaltus.c

@@ -39,7 +39,7 @@ void KingDaltus(Entity* this) {
 void sub_08066654(Entity* this) {
     this->action = 1;
     this->spriteSettings.draw = 1;
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
     InitAnimationForceUpdate(this, 2);
 }
@@ -72,7 +72,7 @@ void sub_080666DC(Entity* this) {
 void sub_080666E4(Entity* this) {
     this->action = 1;
     this->spriteSettings.draw = 1;
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_0807DD50(this);
 }
 

src/npc/librari.c

@@ -9,7 +9,7 @@ void Librari(Entity* this) {
             this->action = 1;
             this->spriteSettings.draw = TRUE;
             this->animationState = this->timer;
-            this->field_0x68.HALF.LO = sub_0801E99C(this);
+            this->field_0x68.HALF.LO = GetFusionToOffer(this);
             sub_08078784(this, this->field_0x68.HALF.LO);
             SetDefaultPriority(this, PRIO_MESSAGE);
             sub_0807DD50(this);

src/npc/malon.c

@@ -43,7 +43,7 @@ void sub_08065888(Entity* this) {
     this->action = 1;
     this->spriteSettings.draw = 1;
     this->animationState = 4;
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
     sub_0807DD50(this);
 }

src/npc/mama.c

@@ -93,7 +93,7 @@ void sub_0806C4DC(Entity* this) {
 }
 
 void sub_0806C4F8(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/mayorHagen.c

@@ -11,7 +11,7 @@ void MayorHagen(Entity* this) {
         case 0:
             this->action = 1;
             this->field_0x68.HALF.HI = 0;
-            this->field_0x68.HALF.LO = sub_0801E99C(this);
+            this->field_0x68.HALF.LO = GetFusionToOffer(this);
             SetDefaultPriority(this, PRIO_MESSAGE);
             sub_0807DD50(this);
             break;
@@ -44,7 +44,7 @@ void sub_0806CE5C(Entity* this) {
         8,
         16,
     };
-    sub_08078784(this, sub_0801E99C(this));
+    sub_08078784(this, GetFusionToOffer(this));
     sub_08078850(this, 1, 0, gUnk_08113F44);
 }
 

src/npc/melari.c

@@ -101,7 +101,7 @@ void sub_08068780(Entity* this) {
 }
 
 void sub_08068884(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/ministerPotho.c

@@ -60,7 +60,7 @@ void sub_08066864(Entity* this) {
         case 0:
             this->action = 1;
             this->spriteSettings.draw = 1;
-            this->field_0x68.HALF.LO = sub_0801E99C(this);
+            this->field_0x68.HALF.LO = GetFusionToOffer(this);
             sub_0807DD50(this);
             break;
         case 1:
@@ -82,7 +82,7 @@ void sub_08066864(Entity* this) {
 }
 
 void sub_080668F0(Entity* this) {
-    sub_08078784(this, sub_0801E99C(this));
+    sub_08078784(this, GetFusionToOffer(this));
 }
 
 void sub_08066904(Entity* this) {

src/npc/mountainMinish.c

@@ -180,7 +180,7 @@ void sub_08067EF0(Entity* this) {
 }
 
 void sub_08068104(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/mutoh.c

@@ -83,7 +83,7 @@ void sub_080670E4(Entity* this) {
 }
 
 void sub_08067100(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/nayru.c

@@ -30,7 +30,7 @@ void Nayru(Entity* this) {
 }
 
 void sub_08064928(Entity* this) {
-    u32 tmp = sub_0801E99C(this);
+    u32 tmp = GetFusionToOffer(this);
     if ((gSave.fuserProgress[GetFuserId(this)] != 0) && (gSave.global_progress < 7)) {
         tmp = 0;
     }

src/npc/npc4E.c

@@ -83,7 +83,7 @@ u8 sub_0806DA3C(Entity* this) {
         case 8:
         case 9:
         case 10:
-            result = sub_0801E99C(this);
+            result = GetFusionToOffer(this);
             break;
     }
     return result;

src/npc/percy.c

@@ -162,7 +162,7 @@ void sub_0806B540(Entity* this) {
 }
 
 void sub_0806B60C(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/pina.c

@@ -151,7 +151,7 @@ void sub_08063C90(Entity* this) {
 }
 
 void sub_08063CAC(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/postman.c

@@ -234,7 +234,7 @@ void sub_08060528(Entity* this) {
             this->field_0x68.HALF.HI = 0;
             this->field_0x6a.HWORD = 0;
             this->field_0x6c.HALF.HI = 0;
-            this->field_0x6c.HALF.LO = sub_0801E99C(this);
+            this->field_0x6c.HALF.LO = GetFusionToOffer(this);
             sub_0807DD50(this);
             break;
         case 1:
@@ -293,7 +293,7 @@ void sub_08060528(Entity* this) {
 }
 
 void sub_080606C0(Entity* this) {
-    this->field_0x6c.HALF.LO = sub_0801E99C(this);
+    this->field_0x6c.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x6c.HALF.LO);
 }
 

src/npc/sittingPerson.c

@@ -236,7 +236,7 @@ void SittingPerson_Head(Entity* this) {
 }
 
 void sub_080639D0(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/smith.c

@@ -73,7 +73,7 @@ void Smith_Head(Entity* this) {
 void sub_080660EC(Entity* this) {
     if (LoadExtraSpriteData(this, gUnk_08110354)) {
         this->action = 1;
-        this->field_0x68.HALF.LO = sub_0801E99C(this);
+        this->field_0x68.HALF.LO = GetFusionToOffer(this);
         InitAnimationForceUpdate(this, 2);
     }
 }
@@ -109,7 +109,7 @@ void sub_08066178(Entity* this) {
     if (LoadExtraSpriteData(this, gUnk_08110354)) {
         this->action = 1;
         this->spriteSettings.draw = 1;
-        this->field_0x68.HALF.LO = sub_0801E99C(this);
+        this->field_0x68.HALF.LO = GetFusionToOffer(this);
         sub_0807DD50(this);
     }
 }

src/npc/sturgeon.c

@@ -141,7 +141,7 @@ void sub_08064C9C(Entity* this) {
 }
 
 void sub_08064CC0(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/talon.c

@@ -78,7 +78,7 @@ void sub_08065608(Entity* this) {
     if (LoadExtraSpriteData(this, gUnk_0810FEB0)) {
         this->action = 1;
         this->spriteSettings.draw = 1;
-        this->field_0x68.HALF.LO = sub_0801E99C(this);
+        this->field_0x68.HALF.LO = GetFusionToOffer(this);
         sub_08078784(this, this->field_0x68.HALF.LO);
         sub_0807DD50(this);
     }

src/npc/teachers.c

@@ -43,7 +43,7 @@ void Teachers(Entity* this) {
 }
 
 void sub_0806C674(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     sub_08078784(this, this->field_0x68.HALF.LO);
 }
 

src/npc/tingleSiblings.c

@@ -68,7 +68,7 @@ void sub_08064DE4(Entity* this) {
         case 2:
             if (UpdateFuseInteraction(this)) {
                 this->action = 1;
-                sub_0801E99C(this);
+                GetFusionToOffer(this);
             }
             break;
     }
@@ -84,7 +84,7 @@ void sub_08064DE4(Entity* this) {
 }
 
 void sub_08064EA4(Entity* this) {
-    this->field_0x68.HALF.LO = sub_0801E99C(this);
+    this->field_0x68.HALF.LO = GetFusionToOffer(this);
     switch (this->type) {
         case 0:
             if ((CheckKinstoneFused(KINSTONE_59) != 0) && (GetInventoryValue(ITEM_MAGIC_BOOMERANG) == 0)) {

src/npc/townMinish.c

@@ -208,7 +208,7 @@ void sub_0806ACC4(Entity* this) {
             this->animationState = delay * 2;
             this->timer = 0;
 
-            this->field_0x68.HALF.LO = sub_0801E99C(this);
+            this->field_0x68.HALF.LO = GetFusionToOffer(this);
             sub_0807DD50(this);
             InitializeAnimation(this, (this->animationState / 2) + 8);
             break;

src/npc/townsperson.c

@@ -104,7 +104,7 @@ void sub_08061CEC(Entity* this) {
             this->field_0x6a.HWORD = (uVar2 >> 0x10);
         }
         *(u16*)&this->field_0x6c = uVar2;
-        this->field_0x68.HALF.LO = sub_0801E99C(this);
+        this->field_0x68.HALF.LO = GetFusionToOffer(this);
         sub_0807DD64(this);
         sub_08061D64(this);
     }

src/npc/windTribespeople.c

@@ -81,7 +81,7 @@ void sub_0806C85C(Entity* this) {
 void sub_0806C870(Entity* this) {
     u8 bVar1;
 
-    bVar1 = sub_0801E99C(this);
+    bVar1 = GetFusionToOffer(this);
     this->field_0x68.HALF.LO = bVar1;
     sub_08078784(this, this->field_0x68.HALF.LO);
 }