diff --git a/asm/non_matching/armos/sub_080304BC.inc b/asm/non_matching/armos/sub_080304BC.inc deleted file mode 100644 index 5d872b51..00000000 --- a/asm/non_matching/armos/sub_080304BC.inc +++ /dev/null @@ -1,29 +0,0 @@ - .syntax unified - push {r4, lr} - adds r4, r0, #0 - bl sub_080309A8 - adds r3, r4, #0 - adds r3, #0x5a - ldrb r1, [r3] - movs r0, #0x80 - ands r0, r1 - lsls r0, r0, #0x18 - lsrs r2, r0, #0x18 - cmp r2, #0 - beq _080304DE - adds r0, r4, #0 - bl sub_08030580 - b _080304F0 -_080304DE: - lsls r0, r1, #0x18 - lsrs r0, r0, #0x18 - cmp r0, #1 - bne _080304F0 - strb r2, [r3] - movs r0, #0x95 - lsls r0, r0, #1 - bl EnqueueSFX -_080304F0: - pop {r4, pc} - .align 2, 0 - .syntax divided diff --git a/src/enemy/armos.c b/src/enemy/armos.c index c2f4d54a..90f19cec 100644 --- a/src/enemy/armos.c +++ b/src/enemy/armos.c @@ -240,21 +240,15 @@ void sub_08030474(ArmosEntity* this) { } } -NONMATCH("asm/non_matching/armos/sub_080304BC.inc", void sub_080304BC(ArmosEntity* this)) { - u32 tmp; - +void sub_080304BC(ArmosEntity* this) { sub_080309A8(this); - tmp = super->frame & ANIM_DONE; - if (tmp != 0) { + if ((super->frame & ANIM_DONE) != 0) { sub_08030580(this); - } else { - if (super->frame == 1) { - super->frame = tmp; - EnqueueSFX(SFX_12A); - } + } else if (super->frame == 1) { + super->frame = 0; + EnqueueSFX(SFX_12A); } } -END_NONMATCH void sub_080304F4(ArmosEntity* this) { LinearMoveUpdate(super);