mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-07-01 04:10:16 -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
asm/non_matching/mazaal/sub_0803473C.inc
-66
View File
@@ -1,66 +0,0 @@
.syntax unified
push {r4, r5, lr}
adds r3, r0, #0
adds r0, #0x7d
ldrb r1, [r0]
movs r0, #0x10
ands r0, r1
cmp r0, #0
beq _08034764
ldr r0, [r3, #0x74]
ldrb r0, [r0, #0xc]
cmp r0, #0x28
bhi _080347B0
ldr r0, _08034760 @ =gPlayerEntity
movs r1, #0x2e
ldrsh r0, [r0, r1]
adds r2, r0, #0
subs r2, #0x60
b _08034776
.align 2, 0
_08034760: .4byte gPlayerEntity
_08034764:
ldr r0, [r3, #0x78]
ldrb r0, [r0, #0xc]
cmp r0, #0x28
bhi _080347B0
ldr r0, _08034790 @ =gPlayerEntity
movs r5, #0x2e
ldrsh r0, [r0, r5]
adds r2, r0, #0
adds r2, #0x60
_08034776:
ldr r0, _08034794 @ =gRoomControls
ldrh r4, [r0, #6]
subs r0, r2, #4
movs r5, #0x2e
ldrsh r1, [r3, r5]
cmp r0, r1
bls _08034798
adds r0, r4, #0
adds r0, #0xe0
cmp r0, r1
blo _080347B0
movs r0, #8
b _080347A8
.align 2, 0
_08034790: .4byte gPlayerEntity
_08034794: .4byte gRoomControls
_08034798:
adds r0, r2, #4
cmp r0, r1
bhs _080347B0
adds r0, r4, #0
adds r0, #0x90
cmp r0, r1
bhi _080347B0
movs r0, #0x18
_080347A8:
strb r0, [r3, #0x15]
adds r0, r3, #0
bl LinearMoveUpdate
_080347B0:
pop {r4, r5, pc}
.align 2, 0
.syntax divided
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;