mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-20 14:15:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #293 from nonmatch/patch-29

Browse Source
This commit is contained in:
notyourav
2022-01-12 10:40:52 -08:00
committed by GitHub
parent 40f6a15e1f 0faf1767cb
commit a34b5fe55d
2 changed files with 3 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/mazaalHead.c
+3 -6
View File
@@ -535,8 +535,7 @@ void sub_080346C8(Entity* this) {
}
}
NONMATCH("asm/non_matching/mazaal/sub_0803473C.inc", void sub_0803473C(Entity* this)) {
u32 direction;
void sub_0803473C(Entity* this) {
u32 playerX;
u32 roomX;
@@ -556,7 +555,7 @@ NONMATCH("asm/non_matching/mazaal/sub_0803473C.inc", void sub_0803473C(Entity* t
if (roomX + 0xe0 < this->x.HALF.HI) {
return;
}
direction = 8;
this->direction = 8;
} else {
if (playerX + 4 >= this->x.HALF.HI) {
return;
@@ -564,12 +563,10 @@ NONMATCH("asm/non_matching/mazaal/sub_0803473C.inc", void sub_0803473C(Entity* t
if (roomX + 0x90 > this->x.HALF.HI) {
return;
}
direction = 0x18;
this->direction = 0x18;
}
this->direction = direction;
LinearMoveUpdate(this);
}
END_NONMATCH
void sub_080347B4(Entity* this) {
u32 playerX = gPlayerEntity.x.HALF.HI;