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

Merge pull request #658 from tonyjih/match_sub_08039B28 

Match sub_08039B28
This commit is contained in:
Theo 2023-12-23 21:07:49 -08:00 committed by GitHub
parent 040b1f3a59 c8598c065d
commit 50b8efb7d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/enemy/stalfos.c
View File

@ -453,25 +453,24 @@ u32 sub_08039B28(StalfosEntity* this) {
const u16* ptr; const u16* ptr;
const s8* ptr2; const s8* ptr2;
if (super->child == NULL) { if (super->child != NULL) {
return (u16)-1;
}
ptr2 = &gUnk_080CF930[super->animationState * 2]; ptr2 = &gUnk_080CF930[super->animationState * 2];
pos = COORD_TO_TILE_OFFSET(super, -ptr2[0], -ptr2[1]); pos = COORD_TO_TILE_OFFSET(super, -ptr2[0], -ptr2[1]);
tileType = GetTileType(pos, (u32)super->collisionLayer); tileType = GetTileType(pos, (u32)super->collisionLayer);
ptr = gUnk_080CF938; ptr = gUnk_080CF938;
do { do {
if (ptr[0] != tileType) { if (ptr[0] == tileType) {
ptr += 2;
} else {
goto found;
}
} while (ptr[0] != 0);
}
return 0xffff;
found:
super->type2 = ptr[1]; super->type2 = ptr[1];
return pos; return pos;
} }
ptr += 2;
} while (ptr[0] != 0);
return (u16)-1;
}
void (*const Stalfos_Functions[])(StalfosEntity*) = { void (*const Stalfos_Functions[])(StalfosEntity*) = {
Stalfos_OnTick, Stalfos_OnTick,