summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatobat <69204835+Catobat@users.noreply.github.com>2023-01-08 16:46:07 +0100
committerCatobat <69204835+Catobat@users.noreply.github.com>2023-01-08 16:46:07 +0100
commit8515634fa98120084c54de11d0d5eeeb8053ce5c (patch)
treebd004aaf55b14f61b194d93dcad6a95bd89df51b
parent4ab73f8eb752722a682d5a610e2e8d2836e4bf38 (diff)
Name more functions
-rw-r--r--include/kinstone.h2
-rw-r--r--include/npc.h2
-rw-r--r--src/common.c6
-rw-r--r--src/enemy/businessScrub.c2
-rw-r--r--src/menu/pauseMenu.c4
-rw-r--r--src/npc/anju.c2
-rw-r--r--src/npc/bladeBrothers.c2
-rw-r--r--src/npc/brocco.c2
-rw-r--r--src/npc/carpenter.c2
-rw-r--r--src/npc/cat.c2
-rw-r--r--src/npc/cow.c2
-rw-r--r--src/npc/cucco.c2
-rw-r--r--src/npc/cuccoChick.c2
-rw-r--r--src/npc/dampe.c2
-rw-r--r--src/npc/din.c2
-rw-r--r--src/npc/dog.c2
-rw-r--r--src/npc/epona.c2
-rw-r--r--src/npc/farmers.c2
-rw-r--r--src/npc/farore.c2
-rw-r--r--src/npc/festari.c2
-rw-r--r--src/npc/forestMinish.c2
-rw-r--r--src/npc/gentari.c2
-rw-r--r--src/npc/ghostBrothers.c2
-rw-r--r--src/npc/gina.c2
-rw-r--r--src/npc/goron.c2
-rw-r--r--src/npc/gregal.c2
-rw-r--r--src/npc/hurdyGurdyMan.c2
-rw-r--r--src/npc/kid.c2
-rw-r--r--src/npc/kingDaltus.c4
-rw-r--r--src/npc/librari.c2
-rw-r--r--src/npc/malon.c2
-rw-r--r--src/npc/mama.c2
-rw-r--r--src/npc/mayorHagen.c4
-rw-r--r--src/npc/melari.c2
-rw-r--r--src/npc/ministerPotho.c4
-rw-r--r--src/npc/mountainMinish.c2
-rw-r--r--src/npc/mutoh.c2
-rw-r--r--src/npc/nayru.c2
-rw-r--r--src/npc/npc4E.c2
-rw-r--r--src/npc/percy.c2
-rw-r--r--src/npc/pina.c2
-rw-r--r--src/npc/postman.c4
-rw-r--r--src/npc/sittingPerson.c2
-rw-r--r--src/npc/smith.c4
-rw-r--r--src/npc/sturgeon.c2
-rw-r--r--src/npc/talon.c2
-rw-r--r--src/npc/teachers.c2
-rw-r--r--src/npc/tingleSiblings.c4
-rw-r--r--src/npc/townMinish.c2
-rw-r--r--src/npc/townsperson.c2
-rw-r--r--src/npc/windTribespeople.c2
51 files changed, 60 insertions, 60 deletions
diff --git a/include/kinstone.h b/include/kinstone.h
index 486b4ca9..0b889f13 100644
--- a/include/kinstone.h
+++ b/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;
diff --git a/include/npc.h b/include/npc.h
index 6f719154..6588f1d4 100644
--- a/include/npc.h
+++ b/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);
diff --git a/src/common.c b/src/common.c
index a205833b..3a0e2618 100644
--- a/src/common.c
+++ b/src/common.c
@@ -899,8 +899,8 @@ s32 GetIndexInKinstoneBag(u32 kinstoneId) {
return -1;
}
-// Check conditions, something with kinstones
-void sub_0801E8D4(void) {
+// For example if a chest from a fusion is opened, hide the chest marker
+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;
diff --git a/src/enemy/businessScrub.c b/src/enemy/businessScrub.c
index 9084508b..643b63e6 100644
--- a/src/enemy/businessScrub.c
+++ b/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) {
diff --git a/src/menu/pauseMenu.c b/src/menu/pauseMenu.c
index 3af4f5eb..0b76815b 100644
--- a/src/menu/pauseMenu.c
+++ b/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 {
diff --git a/src/npc/anju.c b/src/npc/anju.c
index 224978a9..59fa7ce1 100644
--- a/src/npc/anju.c
+++ b/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);
}
diff --git a/src/npc/bladeBrothers.c b/src/npc/bladeBrothers.c
index fb31384a..93dbfccc 100644
--- a/src/npc/bladeBrothers.c
+++ b/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);
}
diff --git a/src/npc/brocco.c b/src/npc/brocco.c
index 5a860d69..28edb9a2 100644
--- a/src/npc/brocco.c
+++ b/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);
}
diff --git a/src/npc/carpenter.c b/src/npc/carpenter.c
index a4da0fff..e7781a50 100644
--- a/src/npc/carpenter.c
+++ b/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);
}
diff --git a/src/npc/cat.c b/src/npc/cat.c
index 11c85fd3..7eebb148 100644
--- a/src/npc/cat.c
+++ b/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) {
diff --git a/src/npc/cow.c b/src/npc/cow.c
index e418ecd9..7c99efb9 100644
--- a/src/npc/cow.c
+++ b/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);
}
diff --git a/src/npc/cucco.c b/src/npc/cucco.c
index de157e63..5710d40a 100644
--- a/src/npc/cucco.c
+++ b/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;
diff --git a/src/npc/cuccoChick.c b/src/npc/cuccoChick.c
index e73045ca..22d29486 100644
--- a/src/npc/cuccoChick.c
+++ b/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;
diff --git a/src/npc/dampe.c b/src/npc/dampe.c
index dbdff1e9..6c587232 100644
--- a/src/npc/dampe.c
+++ b/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);
}
diff --git a/src/npc/din.c b/src/npc/din.c
index ab9d6940..b803d9a2 100644
--- a/src/npc/din.c
+++ b/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;
}
diff --git a/src/npc/dog.c b/src/npc/dog.c
index fef5cd27..e3c287d9 100644
--- a/src/npc/dog.c
+++ b/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) {
diff --git a/src/npc/epona.c b/src/npc/epona.c
index 5c5adafa..544a749d 100644
--- a/src/npc/epona.c
+++ b/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);
}
diff --git a/src/npc/farmers.c b/src/npc/farmers.c
index 59de6957..1fa4357c 100644
--- a/src/npc/farmers.c
+++ b/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) {
diff --git a/src/npc/farore.c b/src/npc/farore.c
index f45aeb17..fa5f25c3 100644
--- a/src/npc/farore.c
+++ b/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;
}
diff --git a/src/npc/festari.c b/src/npc/festari.c
index 5d698d36..781cc9cf 100644
--- a/src/npc/festari.c
+++ b/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);
}
diff --git a/src/npc/forestMinish.c b/src/npc/forestMinish.c
index 7f3625f0..9a898c67 100644
--- a/src/npc/forestMinish.c
+++ b/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);
}
diff --git a/src/npc/gentari.c b/src/npc/gentari.c
index bf7818c1..3ba91821 100644
--- a/src/npc/gentari.c
+++ b/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;
diff --git a/src/npc/ghostBrothers.c b/src/npc/ghostBrothers.c
index e427c01e..afcb7f2b 100644
--- a/src/npc/ghostBrothers.c
+++ b/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);
}
diff --git a/src/npc/gina.c b/src/npc/gina.c
index 4a729d2e..0bb49f92 100644
--- a/src/npc/gina.c
+++ b/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;
diff --git a/src/npc/goron.c b/src/npc/goron.c
index e046f7c9..8056bf52 100644
--- a/src/npc/goron.c
+++ b/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) {
diff --git a/src/npc/gregal.c b/src/npc/gregal.c
index 87333383..7d867bf0 100644
--- a/src/npc/gregal.c
+++ b/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);
}
diff --git a/src/npc/hurdyGurdyMan.c b/src/npc/hurdyGurdyMan.c
index 04c91d9d..46ee55f0 100644
--- a/src/npc/hurdyGurdyMan.c
+++ b/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);
}
diff --git a/src/npc/kid.c b/src/npc/kid.c
index 59e1e87f..7aacefff 100644
--- a/src/npc/kid.c
+++ b/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);
}
diff --git a/src/npc/kingDaltus.c b/src/npc/kingDaltus.c
index bc22daa4..2d9c2989 100644
--- a/src/npc/kingDaltus.c
+++ b/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);
}
diff --git a/src/npc/librari.c b/src/npc/librari.c
index 5f0b6786..819b5a61 100644
--- a/src/npc/librari.c
+++ b/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);
diff --git a/src/npc/malon.c b/src/npc/malon.c
index d38be5aa..0270006d 100644
--- a/src/npc/malon.c
+++ b/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);
}
diff --git a/src/npc/mama.c b/src/npc/mama.c
index 0cbda85b..95758b1c 100644
--- a/src/npc/mama.c
+++ b/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);
}
diff --git a/src/npc/mayorHagen.c b/src/npc/mayorHagen.c
index 5550feb6..1cef31bc 100644
--- a/src/npc/mayorHagen.c
+++ b/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);
}
diff --git a/src/npc/melari.c b/src/npc/melari.c
index 7e20dbed..5c72230b 100644
--- a/src/npc/melari.c
+++ b/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);
}
diff --git a/src/npc/ministerPotho.c b/src/npc/ministerPotho.c
index 72323ed3..9ee87713 100644
--- a/src/npc/ministerPotho.c
+++ b/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) {
diff --git a/src/npc/mountainMinish.c b/src/npc/mountainMinish.c
index 647b550a..ca0d3574 100644
--- a/src/npc/mountainMinish.c
+++ b/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);
}
diff --git a/src/npc/mutoh.c b/src/npc/mutoh.c
index d1d5a00a..5cb1691e 100644
--- a/src/npc/mutoh.c
+++ b/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);
}
diff --git a/src/npc/nayru.c b/src/npc/nayru.c
index 89d8bbac..35176f0b 100644
--- a/src/npc/nayru.c
+++ b/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;
}
diff --git a/src/npc/npc4E.c b/src/npc/npc4E.c
index 3e4bc3c7..42c3b02d 100644
--- a/src/npc/npc4E.c
+++ b/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;
diff --git a/src/npc/percy.c b/src/npc/percy.c
index d04f61d5..22753a85 100644
--- a/src/npc/percy.c
+++ b/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);
}
diff --git a/src/npc/pina.c b/src/npc/pina.c
index 545a4097..00d73a13 100644
--- a/src/npc/pina.c
+++ b/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);
}
diff --git a/src/npc/postman.c b/src/npc/postman.c
index 2bdeedd2..06fa095c 100644
--- a/src/npc/postman.c
+++ b/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);
}
diff --git a/src/npc/sittingPerson.c b/src/npc/sittingPerson.c
index 6fc0ec00..b7f7af0c 100644
--- a/src/npc/sittingPerson.c
+++ b/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);
}
diff --git a/src/npc/smith.c b/src/npc/smith.c
index e6663737..08013aa7 100644
--- a/src/npc/smith.c
+++ b/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);
}
}
diff --git a/src/npc/sturgeon.c b/src/npc/sturgeon.c
index 7ee3e4bc..d4902142 100644
--- a/src/npc/sturgeon.c
+++ b/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);
}
diff --git a/src/npc/talon.c b/src/npc/talon.c
index 8de3c789..b2d99ca8 100644
--- a/src/npc/talon.c
+++ b/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);
}
diff --git a/src/npc/teachers.c b/src/npc/teachers.c
index 4ff317ad..763bf448 100644
--- a/src/npc/teachers.c
+++ b/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);
}
diff --git a/src/npc/tingleSiblings.c b/src/npc/tingleSiblings.c
index 0bf334c9..cb22cf1d 100644
--- a/src/npc/tingleSiblings.c
+++ b/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)) {
diff --git a/src/npc/townMinish.c b/src/npc/townMinish.c
index 85630b7c..69f729d7 100644
--- a/src/npc/townMinish.c
+++ b/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;
diff --git a/src/npc/townsperson.c b/src/npc/townsperson.c
index 4def0fca..862e00f5 100644
--- a/src/npc/townsperson.c
+++ b/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);
}
diff --git a/src/npc/windTribespeople.c b/src/npc/windTribespeople.c
index 2018581f..d60e0b37 100644
--- a/src/npc/windTribespeople.c
+++ b/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);
}