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

Match sub_080249F4

This commit is contained in:
Ibot02 2022-01-08 18:08:02 +01:00
parent dd6953fac9
commit 08558c96bd
2 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
asm/non_matching/pesto/sub_080249F4.inc
View File

@ -1,24 +0,0 @@
.syntax unified
.text
push {lr}
adds r2, r0, #0
ldrb r0, [r2, #0x15]
adds r1, r0, #2
movs r0, #0x1f
ands r1, r0
lsrs r1, r1, #2
ldrb r0, [r2, #0x14]
cmp r1, r0
beq _08024A12
strb r1, [r2, #0x14]
ldrb r1, [r2, #0x14]
adds r0, r2, #0
bl InitializeAnimation
_08024A12:
pop {pc}
.syntax divided

6
src/enemy/pesto.c
View File

@ -564,14 +564,14 @@ void sub_080249DC(Entity* this) {
InitializeAnimation(this, this->animationState);
}
NONMATCH("asm/non_matching/pesto/sub_080249F4.inc", void sub_080249F4(Entity* this)) {
u8 direction = ((this->direction + 2) & 0x1c) >> 2;
void sub_080249F4(Entity* this) {
u32 direction = ((this->direction + 2) & 0x1f);
direction >>= 2;
if (direction != this->animationState) {
this->animationState = direction;
InitializeAnimation(this, this->animationState);
}
}
END_NONMATCH
void sub_08024A14(Entity* this, u32 param_2, u32 param_3) {
u8 unk = FALSE;