mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-16 13:17:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

match non-matching smith function

Browse Source
This commit is contained in:
Behemoth
2020-08-25 20:11:01 +02:00
parent 9c1a238675
commit 2435175868
2 changed files with 4 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/smith.c
+4 -12
View File
@@ -29,18 +29,16 @@ extern Dialog gUnk_08110390[];
extern u16 gUnk_081103D0[];
extern u32 gUnk_081103E0;
#if NON_MATCHING // reg-alloc
void Smith(Entity* this) {
u32 iVar2;
u32 iVar4;
u32 index;
if ((this->flags & 2) != 0) {
if (this->interactType == 2) {
this->action = 4;
this->interactType = 0;
iVar4 = (this->animIndex == 0xc) ? 8 : 0;
iVar2 = sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity));
InitAnimationForceUpdate(this, iVar2 + iVar4);
index = (this->animIndex == 0xc) ? 8 : 0;
index += sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity));
InitAnimationForceUpdate(this, index);
sub_0806F118(this);
}
gUnk_0811036C[this->action](this);
@@ -59,12 +57,6 @@ void Smith(Entity* this) {
PlaySFX(gUnk_08110380[(Random() & 7)]);
}
}
#else
NAKED
void Smith(Entity* this) {
asm(".include \"asm/non_matching/smith/smith.inc\"");
}
#endif
void Smith_Head(Entity* this) {
u8 bVar1;