diff --git a/asm/non_matching/pesto/sub_080249F4.inc b/asm/non_matching/pesto/sub_080249F4.inc deleted file mode 100644 index eb1d8683..00000000 --- a/asm/non_matching/pesto/sub_080249F4.inc +++ /dev/null @@ -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 diff --git a/src/enemy/pesto.c b/src/enemy/pesto.c index e0dc9ad1..430f8945 100644 --- a/src/enemy/pesto.c +++ b/src/enemy/pesto.c @@ -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;