mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-09-04 02:29:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #279 from nonmatch/patch-13

Browse Source 
Match sub_08068190
This commit is contained in:
notyourav
2022-01-11 19:46:38 -08:00
committed by GitHub
parent 5c3dc144ab 11b81686e5
commit 410ea3871a
2 changed files with 6 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/sturgeon.c
+6 -9
View File
@@ -13,29 +13,27 @@ void sub_08064CC0(Entity* this);
extern void (*const gUnk_0810FA44[])(Entity*);
void sub_08064C9C(Entity* this);
NONMATCH("asm/non_matching/sturgeon/Sturgeon.inc", void Sturgeon(Entity* this)) {
u8 uVar2;
void Sturgeon(Entity* this) {
if ((this->flags & 2) == 0) {
gUnk_0810FA44[this->action](this);
sub_0806ED78(this);
} else {
uVar2 = this->action;
if (uVar2 == 0) {
if (this->action == 0) {
if (LoadExtraSpriteData(this, &gUnk_0810FA38) != 0) {
this->action = 1;
this->actionDelay = 0;
sub_0807DD50(this);
}
} else {
if ((uVar2 & 0x80) != 0) {
u32 tmp = this->action & 0x80;
if (tmp) {
if (UpdateFuseInteraction(this) != 0) {
this->action = 1;
}
} else {
if (this->interactType == 2) {
this->action = 0xff;
this->interactType = uVar2 & 0x80;
this->action = this->action | 0xff;
this->interactType = tmp;
InitAnimationForceUpdate(this, sub_0806F5A4(GetFacingDirection(this, &gPlayerEntity)));
sub_0806F118(this);
} else {
@@ -46,7 +44,6 @@ NONMATCH("asm/non_matching/sturgeon/Sturgeon.inc", void Sturgeon(Entity* this))
}
}
}
END_NONMATCH
void sub_08064B44(Entity* this) {
if (LoadExtraSpriteData(this, &gUnk_0810FA38) != 0) {