falso
/
tmc
mirror of https://github.com/zeldaret/tmc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Name some functions for marking a Fuser as done

This commit is contained in:
Catobat 2023-05-05 23:45:29 +02:00
parent 52e635f57b
commit 8ff6027f97
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/scripts/npc/script_Farmer.inc
View File

@ -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

2
data/scripts/npc/script_MysteriousWall.inc
View File

@ -16,7 +16,7 @@ script_0800B98A:
EnablePlayerControl
Jump script_0800B98A
script_0800B99E:
Call sub_0806F188
Call MarkFuserDone
Call EnablePauseMenu
EnablePlayerControl
script_0800B9AC:

2
include/npc.h
View File

@ -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);

8
src/npc/farmers.c
View File

@ -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]);
}

2
src/npcUtils.c
View File

@ -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;