mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-06-28 11:10:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #536 from hatal175/various

Browse Source
This commit is contained in:
notyourav
2022-07-23 11:16:08 -07:00
committed by GitHub
parent aabd340b51 461841290a
commit ccba86d292
19 changed files with 191 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/bowMoblin.c
+4 -6
View File
@@ -31,7 +31,7 @@ void sub_0803C624(BowMoblinEntity*);
void sub_0803C6DC(BowMoblinEntity*);
void sub_0803C714(BowMoblinEntity*);
void sub_0803C634(BowMoblinEntity*);
u32 sub_0803C6F8(BowMoblinEntity*);
bool32 sub_0803C6F8(BowMoblinEntity*);
bool32 sub_0803C568(BowMoblinEntity*);
void sub_0803C664(BowMoblinEntity*);
@@ -111,7 +111,7 @@ void sub_0803C234(BowMoblinEntity* this) {
sub_0803C4B0(this);
}
} else if (sub_0803C6F8(this) != 0) {
} else if (sub_0803C6F8(this)) {
sub_0800417E(super, super->collisions);
super->animationState = ((super->direction + 4) & 0x18) >> 2;
this->unk_0x83++;
@@ -369,10 +369,8 @@ void sub_0803C6DC(BowMoblinEntity* this) {
GetNextFrame(super);
}
u32 sub_0803C6F8(BowMoblinEntity* this) {
u32 tmp = (super->collisions & gUnk_080CFFBC[(super->animationState ^ 1) / 2]);
u32 tmp2 = -tmp;
return (tmp2 | tmp) >> 0x1f;
bool32 sub_0803C6F8(BowMoblinEntity* this) {
return (super->collisions & gUnk_080CFFBC[(super->animationState ^ 1) / 2]) != 0;
}
void sub_0803C714(BowMoblinEntity* this) {
src/enemy/eyegore.c
+1 -1
View File
@@ -370,7 +370,7 @@ void sub_08031024(EyegoreEntity* this) {
gUnk_020000B0->x.HALF.HI, gUnk_020000B0->y.HALF.HI);
} else {
this->unk_79 = 1;
this->unk_78 = (boolresult >> 0x1f);
this->unk_78 = boolresult != 0;
super->direction = CalculateDirectionTo(super->x.HALF.HI, super->y.HALF.HI, this->unk_74, this->unk_76);
}
} else {